From 2013db0527dc2f85ab21cdc37047154a26fd161c Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 28 Jun 2017 21:39:16 -0400 Subject: [PATCH] tests: Fix assert_files_hardlinked It was always succeeding because we were trying to stat the inode number, and failing, and thus getting the empty string for both, which compared as true. Regression from: Noticed this while working on and looking at the test results. Closes: #976 Approved by: jlebon --- tests/libtest.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/libtest.sh b/tests/libtest.sh index ee3f4af8..6f33c5b5 100755 --- a/tests/libtest.sh +++ b/tests/libtest.sh @@ -117,15 +117,14 @@ else fi files_are_hardlinked() { - f1=$(stat -c %i $1) - f2=$(stat -c %i $2) - [ "$f1" == "$f2" ] + inode1=$(stat -c %i $1) + inode2=$(stat -c %i $2) + test -n "${inode1}" && test -n "${inode2}" + [ "${inode1}" == "${inode2}" ] } assert_files_hardlinked() { - f1=$(stat -c %i $1) - f2=$(stat -c %i $2) - if ! files_are_hardlinked "$f1" "$f2"; then + if ! files_are_hardlinked "$1" "$2"; then fatal "Files '$1' and '$2' are not hardlinked" fi } -- 2.30.2